Update some features
Brightcells
променени са 6 файла, в които са добавени 6 реда и са изтрити 6 реда
+ 1
- 1
page/templates/page/clerk_info.html
@@ -50,7 +50,7 @@ |
||
| 50 | 50 |
</div> |
| 51 | 51 |
|
| 52 | 52 |
<script src="//cdn.bootcss.com/zepto/1.1.6/zepto.min.js"></script> |
| 53 |
- <script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script> |
|
| 53 |
+ <script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script> |
|
| 54 | 54 |
<script type="text/javascript" src="{% static 'tamron/js/jswe.js' %}?v=1"></script>
|
| 55 | 55 |
<script> |
| 56 | 56 |
V.initWxData({
|
+ 1
- 1
page/templates/page/clerk_oauth.html
@@ -174,7 +174,7 @@ |
||
| 174 | 174 |
}); |
| 175 | 175 |
{% endif %}
|
| 176 | 176 |
</script> |
| 177 |
- <script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script> |
|
| 177 |
+ <script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script> |
|
| 178 | 178 |
<script type="text/javascript" src="{% static 'tamron/js/jswe.js' %}?v=1"></script>
|
| 179 | 179 |
<script> |
| 180 | 180 |
V.initWxData({
|
+ 1
- 1
page/templates/page/clerk_sale.html
@@ -338,7 +338,7 @@ |
||
| 338 | 338 |
}) |
| 339 | 339 |
}); |
| 340 | 340 |
</script> |
| 341 |
- <script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script> |
|
| 341 |
+ <script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script> |
|
| 342 | 342 |
<script type="text/javascript" src="{% static 'tamron/js/jswe.js' %}?v=12"></script>
|
| 343 | 343 |
<script> |
| 344 | 344 |
V.initWxData({
|
+ 1
- 1
tamron/settings.py
@@ -176,7 +176,7 @@ WECHAT_OAUTH2_REDIRECT_URL = 'https://api.pai.ai/wx_oauth2?redirect_url={}'
|
||
| 176 | 176 |
LOGIT_BODY_FLAG = True |
| 177 | 177 |
LOGIT_RES_FLAG = True |
| 178 | 178 |
|
| 179 |
-DOMAIN = '' |
|
| 179 |
+DOMAIN = 'http://tamron.xfoto.com.cn/' |
|
| 180 | 180 |
|
| 181 | 181 |
try: |
| 182 | 182 |
from local_settings import * |
+ 1
- 1
tamron/uwsgi.bak/tamron_nginx.conf
@@ -1,7 +1,7 @@ |
||
| 1 | 1 |
# tamron_nginx.conf |
| 2 | 2 |
|
| 3 | 3 |
# the upstream component nginx needs to connect to |
| 4 |
-upstream pai2 {
|
|
| 4 |
+upstream tamron {
|
|
| 5 | 5 |
# server unix:///home/paiai/work/tamron/tamron/uwsgi/tamron.sock; # for a file socket |
| 6 | 6 |
server 127.0.0.1:8888; # for a web port socket (we'll use this first) |
| 7 | 7 |
} |
+ 1
- 1
utils/error/errno_utils.py
@@ -4,7 +4,7 @@ from StatusCode import BaseStatusCode, StatusCodeField |
||
| 4 | 4 |
|
| 5 | 5 |
|
| 6 | 6 |
class FranchiserStatusCode(BaseStatusCode): |
| 7 |
- """ 店员相关错误码 4001xx """ |
|
| 7 |
+ """ 经销商相关错误码 4000xx """ |
|
| 8 | 8 |
CHISER_NOT_FOUND = StatusCodeField(400001, 'Chiser Not Found', description=u'经销商不存在') |
| 9 | 9 |
|
| 10 | 10 |
|